Spencer Rathbun 9f4c9999f2 Refs #3836. Merge branch 'release/v0.6.0+2013.11.04' into develop %!s(int64=12) %!d(string=hai) anos
..
lib 9f4c9999f2 Refs #3836. Merge branch 'release/v0.6.0+2013.11.04' into develop %!s(int64=12) %!d(string=hai) anos