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