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