Commit 26c28114ee0efcd201a2b6e652eeb2b2f655d6c8

Alex Szpakowski 2015-04-08T15:35:07

Merged default into iOS-improvements