http://jira.aplana.com/browse/APLANATS-1519
Merge remote-tracking branch 'origin/master'