Commit 2096583140a982befef7eda26954cba286596f04

Alex Szpakowski 2014-08-04T15:30:53

Merged branch default into iOS-improvements