Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 13:13:45 PDT 2014