Sync'd branch releases/aurora with upstream @ Sun Oct 26 07:54:19 PDT 2014