Sync'd branch releases/beta with upstream @ Mon Sep 15 10:00:31 PDT 2014