Sync'd branch releases/aurora with upstream @ Tue Sep 23 10:08:33 PDT 2014