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