Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 07:42:37 PDT 2014