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