Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 03:34:29 PDT 2014