Merge pull request #1494 from seanpaultaylor/next

Fixes #1466.
Merge pull request #1495 from seanpaultaylor/next

Fix for android build
Enable C++11 on iOS and MacOSX