Revision 5666bc5ec18cfb1fd7078b9e1e0169dd9afb653e

Committed on 15/12/2015 6:09 am by Tyler Harms <tyler.harms@gmail.com> [GitHub Diff]

Merge branch 'master' into addPlatformContentCopySupport