Fixed compilation error.
Merge branch '20140401-dev-stable' into feature-20140423-removed-arm64