Sync'd branch releases/aurora with upstream @ Sat Sep 27 11:45:35 PDT 2014