Sync'd branch releases/aurora with upstream @ Fri Sep 26 14:37:37 PDT 2014