Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 07:25:42 PDT 2014