Merge remote branch 'origin/intelliship_20140617_mp' into development